Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 16:53:03 +0000 (09:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 18 Sep 2011 16:53:03 +0000 (09:53 -0700)
commitf506475f81cc8909aae3c487c62f5721914fb680
treed7973b45dec24b53efcd843673f9b3f06af677e7
parentc019b20f49569cc286b71400edfc35bff768ba06
parenta33a1cf431b2fff599abb8af54516c64e80039c7
Merge from trunk.